Enhance database & responses to wrap row properties