Several fixes and improvements. Now can handle source already on scope and async sources from services or other async call