Added new classes for creating contour plots