Add MessageService and other