Small changes on resource class