Refactored away inheritance from resource holders