Removed unique saga id class and using index