update for new whirr-cm features