Updated to last version (index changes and new API naming)