Fixed up the to / from pojo with parent / child model objects