Updated to support changes to extend/promote