[MD] - Adding more checks on properties files management