Adding license, and refactoring of MessageRouter