Simplified API
Added some comments