Changes that were made for SabreAMF support
Adjustments to allow for direct object construction