Add equipment to model feature and Issue #8