Get rid of constant intfc