Added support to pass in the community