Added and organized more registration verification