Updated for serialization