Refactor base specification