Added carrier model and controller