Add serializarion support