Added a subscriber for Maestros messages
Put include file back in