Sort of updated some interfaces.