Refactor of AutoRank feature