Continue with spec file refactor