Improved Register functionality