using database name from Constant instead of hard coding
misc