Moved info into ENV