feat: More virtual environment and container support