Various changes in interface