#14: Add serialization support - @class added when required