Added initial messaging architecture