Remove forking nonsense
Add option to choose message type