Added registration and authorization