Upgraded inherited_resources