Added Aspect filter support