Fixed the returned value
Added more API method