Removed IMessageRegistry as is not required