Added support for properties files