Added index on classid