Mostly added contour support to db