Resource decorator changes

Decorator changes optimized for embedded associations