Better resource structure