Updated form validators