removed some optimizations, Uri is not converted to byte[] anymore for storage