Added new methods and tests