Refactor 3.0 samples