Ajay | #2600 | Short code for ds should be in lowercase