Restored Validation and added custom class for validation