Updating for proper object handling content-switching and other api operations