Feature/optional source environment