Let me do that in another spec refactor PR. I'd like to focus on basic content for this PR.