More consistency in listing