Made suggested changes to interfaces