In the process of adding NullSource functionality.