Re-add polygon support