Squash support added