More validator work