Added basic resource handling