Added stop class