Faster build