Major signup module changes