Improve maker behavior
Improve samples