Moved users into module