Fixes #1 Replace Data with String and ByteBuffer