Removed hardcoded keywords