Make http context optional and default to false