Clean db model and add table schema for app