Added context state to all contexts