Started adding NServiceBus support