Cleaning up the base resource class some more - still WIP