Updated to properties instead of XML