Updating core instantiation and API code.