WIP : Specification refactoring