Replaced resource class inheritance by class factories