Added current container index