Deprecate a few calls, and update can function