Use the new input API