Move `contained` and `language` to the base resource class