Update for use with new database schema >= CiviCRM 4.3.x