S2 CF16 CR Fixes- Optimizes code by using symbols instead of strings, and handling missing details logic in model in a single step.
https://vinsol.atlassian.net/browse/CF-16