Added some classes to model and facade messages