Added empty message feature