database structure & model overhaul