Added some preliminary filtering capabilities