Get rid of Env singleton
Get rid of Site singleton
Simpler code
TODO
Read list only once
More symmetry