refactor content mappings