Updated Validation and DB Connection