New structure and new ability to pull in environment (stage, production, etc) info