Add list command
Fix module and error handling