Some interface improvements