REL-1501: Added support for storing Scale Interpolation and cleaned up some of the code.