[IMP] Improve parent order