ATM and Deposit classes fixed