Added some member functions