Fewer methods and better exception handling
Fewer methods and better exception handling