Updated Data Access Layer for testing