Added handling of usecases