Added some more functionality.