Model update + doc
Unit Test update