Implement main API change supporting convenience class for setting up context