Added type filters