Added some entity mappings
Tests passing