Added new define keys in preprocessor