Updated feature: Set unserialize/serialize as optional