More changes to support Equidecomposability project