More progress on Use Case Classification