Yeah, that was my concern; we change it to MessageBuilder.