Improved cli base controller abstractions