improve the database manager