Updating to use features instead of keywords