ClassResource - further changes 2