just before adding the consumer/provider interfaces