Move user tracking into standard tag infrastructure