Add 'self lifetimes
Fix index operator overloads