Added more validation helpers