Added support for multiple organizations