Added properties file logic