Decorator hierarchy + resource changes