Updated for tag changes to core