Modified capture filter and adding state messages support