Add some more functionality.