Updated index design