Added adaptive sourcechooser feature