Add explicit type for shape datasource