Deprecate this helper class