Made Origin a child of Entity