Move createMapping call to reset