Changed some interfaces.