Database class is no longer singleton