add databasemanager, etc