Leafs: Proper nesting (with rollback option)
Props: Proper nesting (with rollback option)