Feature/improve environments