Added support for disabled attribute