Added dispatcher and enable / disable functions