Updated Model code and docs