Added support for disabled state on initialization