- Fixed set of kind.
- Improved context behavior.