Refactoring inputs, the input registry and consuming classes