context auto adding feature