added geometry_type and variable