Fixed and update Validation Class