BIG CHANGES, issues with XML to Entity refreshes though