Refactored resolver package, removed SequenceToken