Add some more functions