Moved account exist check to Account Mapper