Refactoring, input pin support