Added some more functionality