Added interface changes and adnotations