Updated classes for Planimeter