Further update of modeling
Added automatic approach to generate contour points