Added more methods.
Added new methods and two new constructors.