Nummerous DB improvements