Moved mappings to separate module (assembly)