Fix #1 Add remaining use cases.