Updated use cases, added optional features