Update package to work with new account system