Made some changes to endpoint registration.