Added resolveOriginal() method