Added more code to Registration