Following RM changes; added configuration from property file