Changed ShortMap to ByteMap.