Minor changes in interface