Contained resource handling improved