Simplify.System.Sources packing added