Cleaned up database and IDatabase to match each other