Add message service and default packaging