Added properties file support