Adds interface imporvements