Added account management impl and made some changes