Added disabled flags and serialization support.