Add missing machine types, remove deprecated machine types, support for getting userdata