Finalized the Database module