Made carrier class even simpler