- improved resource handling