Added some converters for model
Added some converters for model
Recreated entities