Improved environment variable structure