Some interface modifications and additions.