Implemented this also for Account command, since it took all of 30
seconds.