Improved type safety to Cash & Deposit construct