added type to Message