BDM.java and OR.prop update