Added more options to registration