improved env keys + added data for newly merged resources