Updated registration process