Renamed type field to stype