Improve condition just added to be right
Adding define to the whitelisted words