Change signature so sources can be treated as configurable items