Added new validation classes