Add all correct context