Upgraded secondary elements to support 7.1.8