Change interfaces a bit.