Change to not auto create context