Added two sets of messages
Updated startup, for DI