Removed custom serialization