Updates to get database connection working