Build improvement