Fixen data references and moved constructor