ATLAS-2229: Modified approach for detecting keywords. Removed unused keywords.
Signed-off-by: apoorvnaik <apoorvnaik@apache.org>