Add utility class
Manually fixed merge issues