Added name, fixed ByteArray...