Added wrapper to index