Added rank support