Added border-polygon mapping