Many changes, now support validators