Refactoring updates

Necessary updates to work with https://github.com/ArcBees/GWTP/pull/106