Few more toggles added