Adopt to new schemas in apigw