Added STX & ETX support