Refactoring intent API.
2 files changed