Refactored utility classes in socc-core