Added some more keywords

:santa: helps towards #11