Updated files for UI validation