ResourceData, refactor