Added conditional compilation