Added some more static member functions