Initial version
New options for adding and removing comms definitions