Don't want to break the existing API