Refactor answer collection and resouce