Refactored resolvers. Closes #35.