Added some more keywords, working on Lang def