Updated Sample + Doc + API Refactoring