Added empty-messgae interpolation