Improve user guide and user API