Added name parsing