Use proper format for single object
Lots more frontend work