Fixing CommandListener
Implementation messages persistence and retrieval