Made some interface changes