Added TODO about ignoring orphan