I'd probably prefer to keep the existing API for this PR. Perhaps we can revisit constant vs method separately