Make it compatible with the new version of Organizations plugin (v0.4)