Added new types into message definition