Added support for 'Active' and 'Passive' states.