Updated for recent publication changes