Added compile time option