Tweaked some interfaces