Adding some methods. Not tested.