Moved resolving functionality to new class Resolver