Renames supplier to byteSource
Updates to use ByteSource