Added Stakeholders and tweaked UC-1