added source attachment ability