Slim down the Origin class