Some adds to dynamic switch