Add 2 new options + refine getting and storing of source