Few modification to the wifi stack in order to provide better support