Makes the list command more agnostic