Added new methods and Integration Tests