Add organization metric consumer
Add user consumer