Made the DB classes into one partial class