Pull wiggi definition into separate factory