Tidied up interfaces.