Added maped sources
Tweaked configs