Added multipatch support