Improved Environment with Option-based parent and simpler set.