Improved the equipment model with more details