Changed JSON format to allow metadata addition