Moving to .properties file