Deprecate old method and add new ones