Modified typecodes to match spec