Allow for better environment passing