Specs refactored