Updating for API hosting support