Extract resolver to it's own file