Started refactoring for equipment