Changes for use with mccparamedic (should rename the project)