More reworking spec setup