Make address optional