Make input static and improve api