Local entries supported again