Refactor and add ranking simulations