Refactoring: org.tch.generic