Refactoring: moved utility classes