Add indexing for containers