Added Context.
Improvements.