Upgrade registration function!