Added type filter