removed BundleComparator and Codec dependency