Improved compile time switch