added questions support