Props parser improved