Restructured wallet class