Added additonal parsing of user input