Added type filtering