Changed methods of validation