Remove require ordering requirements; add collision class changing support