Authrization and registration improved