Updated mappings, added ComPortCommunication