Update to auto bridging types
Add Page Indicator