Add missing use statement
Fix parent updating
merge