Added some data filtering