Finish builder example
Done builder and fix some diagram