Added support for polygon