Added support for Origin/Enterprise