Edited validator class.