Added support for disabled state