Added decoupled versions from environments