Moved utility methods to separate class

- Fixes client crash