Add Decorators to ensure Parent Entities are Saved