Adding filtering functionarity