Updated input analysis