This patch aims to improve compile time performance by increasing