Changes for improving registration process