And deprecate old methods.