Added support for storing local to global structure