Refactor object mapper. Making less crap.