Little refactoring for OwnMapper
~Make logic more simple
+Add debug logging