Include API updates from Chris