Added some more methods ...