Optimize imports
update code examples
Bug fixed