Udpated replaceProp util