Removed Evaluate call for definition keys