Added Resource support