Work on message adapter + fix on model schema