Make list command faster