Changed API to be more handy