Completed Validation and Input classes