Updated env reading