Updated for new uri primitive, settings types and commands.