Added some interface improvements