Added prop filtering