Add support for .disabled and .active