Refactored Input Types