Cleaned up offering handling and passed deprecation kwarg through deprecated replace functions