Moved Registration into API