Optimization for decoration of entities