Changed some return types in interface to validator