Added better ban support