Table proxy
Improvements to locker and view additions