Add some constants to capture magic values

 MSP-9331