Added account functions to main module