Added rank enumeration