Closed #19 - Equipment modeling