Updated for properties file