Fixed config, added source selection