Support more of the interface.