Refactored Carrier class.