#14 - Listener command option refactored