Doc updates and 'uri' keyword