Refactored inputs