More list commands and a bit of refactoring