Added some communication filtering