(PSP) Refactor input autoconf