Added handling of answers