Update to new L# Common