Improved compilation