Updating spire to conform with CPM changes.