accommodate new helper classes