Added Context class and changed constructors visibility.