Update sources and sinks with Jim's latest update