Major changes to get compatible with Infusionsoft SDK