Sri | Refactored dinodex