Added some more methods