Added message bus and actions