Added ByteString support