Improved ENV Handling