Added check for keywords