Cleaned up interfaces.