Update for OSQA import