Update to make defining environments and jobs more generic.