Updating Account unit - moved methods from library to module