Major refactoring update for Origin