Basic DB framework put back in