Implement changes to orchestral/extension@11a7f4a

Signed-off-by: crynobone <crynobone@gmail.com>