Merge and added streamManagementMode in options