replace Point2D fields with Serializable Points