Added some more DB mappings