Added validation classes