Update to leverage properties file