Updated validators