Added properties file functionality