Added a lots of new methods