added indexes support in commands