Added preparation for faster string creation on enterprise

As discussed earlier :)