Changed to using rules instead of extended validation classes.