Feature#split out discovery