Moved a couple of constants to communicator