Added Context.Current mechanism.
Spring cleaning.