Add consistency improvements