Property file addition and bug fix