Add analysis to targets
Fix #2245 Mappings update incorrect on attribute update
Support entity specific decorators