Resource classes refactored