Updated mappings and EntityCounter with new mappings.