Made a few interface changes