Added stop model and controller