Update content handler.
Fix entity association support.