Improved environments and builder code