Use improved API with more button