DSP-1474: Add more consistency