Updated to latest extend/promote approach.