moved resolver to lib