Adjust resource class loading some more