Fix metadata structure for api
5 files changed