Added resource expansion for simple types