Added Permission Support & Added Functionality