Added resource expansion