Added max rank feature