Reworked Database classes, old school core classes