Added some serialization handlers