Improve multiellipse support