Enhanced DB schema to support new app purpose