Add mode to update
Clean up default vars