Added first changes to the cli for supporting live reload