Improve Merkle design