Added prop parser