Added remaining users methods (2 left as TODOs)