Refactor columns spec