Adding some more functionality