Adding message format config
First working version