Updated input descriptions and handling