Simplify dashboard factory keys