Tweak the way data is returned