Minor changes
Added permission adapter