Added post load for related objects