Adding documentation, increasing Context usage.