Developing our wallets infrastructure