Moved POJO mappers into common