refactoring CustomEntityConverter a bit