Adding source distinction to be able to support importing