Start implementing new schema/DB design for perf improvement