Fixing database class, adding 5.3 just for giggles.