icse15: Complete model with proper points of uncertainty