Improved registration process