Add polygon and multy geometry support