Add objects to match server side api objects