Added hole filling based on shape contours