Changed to use CONSTANTS for the database configuration parameters