Added sample and more fields