Added completion sourcing