Improved attacks detection