Added support for properties file