[#18] Further refactoring of GoMapper