Improved SConstruct