Added support for disabled states.