Adding context controller