Adding validator implementation from waterline