Added entity mapping and update Account method