Postponing deprecation timeline