Refactored user input as an EntityTask