Added minor changes to the interface