refactor, new fields. default resolver