Simplify sourcing