Add additional sample and improvements.