Refactor enrolled spec