Updated files to include database name and path statements