Added new usecases, removed redundant
Updates