Updating to 0.6.4 with organizations