Added ATM classes