Improvements to Entity Shifter