Some DocBlock improvements for Model.php