Move defaults into the lookup