Added multi feature toggling updates