Improved and fixed the properties file loading procedure