Add 'class' declarations to spouts and bolts