Removing string concatenation for entities