adding initial indexable optimizations