More updates
Get rid of inherited_resource