Added legacy APIv2 without keys, cleaned up APIv3 validation