Introduce toggable flag