Added additional pre-compile conditions