Add features for token based registration