Resource classes refactored adding super class.