Tested and improved Model subpackage