Refactor default spec