Improve syntax in Orphan model