Add support for indexat (is branching)