Moved stub resolvers out of stubRepository