#40 Handling associations on entity creation/update