Adding context and check sections