Added code to resolve schema differences.