Add some more functionality