ShapeAdapter is now Serializable