Added Message and Address types.