Adding support for multiple communities