Improve performance by using string vs variable

Finish experiments with di performance