Added enabled to serialization