Updated filters class