Better polygon handling