Moved service messages into package protocol