Add some more functions and aliases