Made default vars more generic