Adapting to new Common Utilities 2.2