Updated with new fields and more final DB form