Refactored input node