Moved consumer instance storage into 'web'