Upgrade for using question library