Improves management of global variables