Updated db-connect to use custom values