Changes to env sync