added message stamper and refactor related