Added new methods and error handling
Added new methods and error handling