SPEC file refactorization