Refactoring
Add CompleteAction concept