Updated for 2007 database