Added xml serialization