Added message and service definitions
fixed errors in message definitions