Changes to better support possible outputs of the Connector Framework.