SOAP-1097: Use existing constants instead of magic numbers