Added additional rankings and optimizations