Added userdata site, some other changes