Changes in Usecases & Presentation