[GEM-dev] Changes in setup() functions