Static Analysis: tweaks to data model and added cpychecker support