Added docBlock and modified message