ClassResource - further changes