Update models and new environment. Fixes 2054.