Added Activate/Deactivate and first steps for serialization done