Updated: Dependencies
Changed: Use replace instead of replaceAll
Update: Fix issue 1 completely by using new method to get oldEntityID