[SPEC] Spec refactored.