CLI & Messages class basic additions