Refactored AddCtrl